Merge pull request #8 from keyvanfatehi/develop

Develop
Merge branch 'master' into develop