master
Merge pull request #92 from dvetal/master

pull me!