Merge pull request #6 from sbabitsky/master

Merge from master