Further modifications
Merge pull request #2 from papulovskiy/master

Further modifications