Merge pull request #2 from Beshkan/master

v2.0 vs master
Merge pull request #3 from Beshkan/v2.0

Merge pull request #2 from Beshkan/master