Merge pull request #2 from mohebifar/master

Merge 2.0 and master