Merge pull request #16 from Khppp/dev

Dev
Merge pull request #17 from Khppp/master

Merge pull request #16 from Khppp/dev