Merge pull request #1 from Windower/master

/
Merge pull request #2 from Windower/master

update
tidying up
Merge pull request #222 from sebyg666/master

tidying code up