Merge pull request #2 from Permafrost/master