Merge pull request #19 from cts12/feature/simon

Tweaks
Final bits