Tweaked to bring in line with hardware testing.
Merge pull request #5 from Ap0c/development

Tweaked to bring in line with hardware testing.