Cleaning commits from maskin-inputs branch

Merge branch 'masking-inputs' into development due problems on pull request #7 from miguelfito/development.