Merge pull request #13 from RAPcores/revert-11-sjk/b_rebase1

Revert "Merge in mpw-one-b changes"