Merge pull request #2 from tsov/master

My changes added
After second run through
Merge pull request #8 from rchodava/master

after second run through sync