implemented cool feature
bang
Merge branch 'cool-feature' into develop