Add fancy stuff
Merge branch 'develop'