wip
Merge branch 'develop' of github.com:michaelaye/diviner into develop on luna4