Adding a fancy feature.
Merge branch 'fancy_feature' into develop