Merge pull request #2 from xellepher/origin

merge of james new changes from toms fork into mikes Origin
Put the speed on it's code or else it gets the hose again...
Merge pull request #3 from mjervis/origin

merge from mjervis origin