Merge pull request #6 from dimasmith/master

Merge
Merge pull request #17 from svovik1/master

Merge pull request #6 from dimasmith/master