Merge pull request #4 from kobliha/master

Already LGTMed in pull request #3