Merge pull request #4 from etenzor/master

Merge
user2 changes
Merge pull request #5 from etenzor/user2

User2
Merge pull request #6 from etenzor/user1

Merge pull request #3 from etenzor/master
Merge pull request #7 from etenzor/master

Merge