Merge branch 'master' into development
Added javadocs
Cleansing of build.gradle
Merge pull request #17 from jorgeb1980/development

Development