Merge pull request #9 from wsenjer/master

V1.1