Merge pull request #4 from sbabitsky/master

Merge from Master