Merge pull request #7 from miguelfito/development

Merge branch 'masking-inputs' into **development**