Fixes #7 closes BH-7