Tutorial sorting now works...
Merge branch 'development'