Merge pull request #28 from joolswills/patch-1