Merge pull request #3 from Aeggis/master

Develop
Merge pull request #4 from Aeggis/develop

Merge pull request #3 from Aeggis/master