Merge pull request #10 from Jastro/Armeys

Merge pull request #9 from Jastro/master
Merge pull request #11 from Jastro/master

+
Merge pull request #12 from Jastro/Jastro

Merge pull request #11 from Jastro/master
Merge pull request #13 from Jastro/Armeys

puff
Merge pull request #14 from Jastro/master

j