Merge pull request #3 from HexSoftware/master

Updating My Fork
fixed some adding
Added Neil's changes

Got RJ's approval
Merge pull request #56 from HexSoftware/nnordhof-master

Nnordhof master