Merge pull request #66 from KasperFranz/patch-1