Merge pull request #1 from shkarimpour/dev

Dev