Merge pull request #2 from Jensyn/master