Merge pull request #10 from pembemiriam/master