Merge pull request #28 from kleer-la/develop

Develop a Master
Merge branch 'master' into develop