stevedonovan Merge pull request #1 from frgm/patch-1