Merge pull request #9 from wsenjer/master

V1.1
Merge pull request #10 from wsenjer/v1.1

Merge pull request #9 from wsenjer/master