Fixes #7 closes BH-7
fixes #8 and fixes BH-8
Fixes BH-9 and fixes #9
fixes #9 and closes BH-9
Merge branch 'dev'