Merge branch 'master' into dev
adding some todos
Merge branch 'dev'