Merge pull request #53 from adamvoss/patch-1