Merge pull request #4 from sbabitsky/master

Merge from Master
Merge pull request #5 from sbabitsky/0.1.1

Merge pull request #4 from sbabitsky/master