Merge pull request #1 from kamelkev/master

Sync with fork built up under my own account.