removed TODO; replaced with GitHub issues
Merge branch 'master' into dev