Merge pull request #318 from kp52/develop

Develop