Merge pull request #9 from Jastro/master

puff