finished a todo
Merge branch 'master' into nuc