Merge pull request #2 from laumin/master

v2.0