Merge pull request #9 from Jastro/master

puff
Merge pull request #10 from Jastro/Armeys

Merge pull request #9 from Jastro/master