Merge pull request #1 from rxs5346/develop

Develop, merged develop to master