Merge pull request #1 from JonyEpsilon/develop

Merging latest code