merg'd with master
Merge pull request #4 from Siimon13/Siimon

merg'd with master