Merge changes
Merge pull request #7 from Peda1996/master

Merge changes