Merge pull request #7 from miguelfito/development

Merge branch 'masking-inputs' into development
Merge pull request #9 from miguelfito/masking-inputs

Cleaning commits from maskin-inputs branch into development one.