Merge pull request #1 from Permafrost/master

will get latest codebase