Merge pull request #1 from shamsan/develop

Clean-up