wip
Merge branch 'develop' of github.com:michaelaye/diviner into develop
noise fix as delivered by Josh
wip
wip