Fix a pull issue with github
Merge branch 'develop'
Cleanup
Merge branch 'develop'