Merge #1 changes
Merge pull request #3 from samoht/master

Merge #1 changes