Cleanup
bumped version
Merge branch 'master' into 213-home-optimalisation
version number bump