Merge pull request #11 from Jastro/master

+