Merge pull request #7 from sbabitsky/0.1.1

Merge pull request #6 from sbabitsky/master
Merge pull request #8 from sbabitsky/master

Merge pull request #7 from sbabitsky/0.1.1