* #3: bug fixes
Merge branch 'development' of https://github.com/BlackBoxCenter/bbcb into development