Merge pull request #70 from andres-erbsen/patch-1