Merge pull request #4 from heiko-braun/master

merge PR from @ehsavoie