Coolio feature added
Merge branch 'master' into feature/coolio
coolio done
Merge branch 'feature/coolio'