Merge pull request #113 from Trivve/patch-2