Merge pull request #1 from grammaton/master