Merge pull request #1 from shkarimpour/dev

Dev
Merge pull request #2 from shkarimpour/master

Merge pull request #1 from shkarimpour/dev