Merge pull request #28 from awratten/patch-1