hashemi/bslox 9 commits