Merge pull request #3 from kormaco/master

Merge