Merge pull request #10 from themoken/master