Implemented a great new feature.
Ready.
Merge branch 'feature/Nice_new_feature' into develop