Merge pull request #12 from bohmber/master

happy new year