Merge pull request #96 from Jjagg/patch-1