dev #3

Closed
fede wants to merge 6 commits from dev into master

6 Commits