Merge pull request #11 from Jastro/master

+
Merge pull request #12 from Jastro/Jastro

Merge pull request #11 from Jastro/master