Merge pull request #1 from mariush13/dev

Merge from dev