Updated todo and readme
Merge branch 'wishlist' into develop