Merge pull request #2 from ryanalbon/develop

Develop
Fixed unresolved merge conflict