Merge pull request #2 from Beshkan/master

v2.0 vs master