Merge pull request #2 from mikeS7/master

Several changes & optimisations
Fix syntax error
Merge pull request #1 from ivesdebruycker/master

Pull from ...