Merge branch 'develop'
Merge pull request #35 from irvs/master

Merge branch 'develop'