Cleanup and add as feature
Merge branch 'develop'