Merge pull request #7 from etenzor/master

Merge