Merge branch 'feature/compass' into develop
WTF