Merge Ian and Moniz branches

Let's get our two sets of code to agree.
Doing it this way allows you to turn "170" into a byte. Otherwise an error is thrown.