Merge pull request #7 from theraot/Develop

Develop
Merge pull request #9 from theraot/master

Master
Merge pull request #10 from theraot/Feature

Merge pull request #7 from theraot/Develop