Merge pull request #2 from mohebifar/master

Merge 2.0 and master
Merge pull request #3 from mohebifar/2.0

Merge pull request #2 from mohebifar/master