Merge pull request #5 from seivan/master

Master to Develop
Merge pull request #6 from seivan/develop

Merge pull request #5 from seivan/master