Merge pull request #7 from etenzor/master

Merge
Merge pull request #8 from etenzor/user1

Merge pull request #7 from etenzor/master