Final bits
Merge pull request #20 from cts12/feature/simon

Final bits