[GP,LA]{other}some more tidying up
Merge pull request #18 from Gerii/master

[GP,LA]{other}some more tidying up