Merge pull request #18 from cts12/feature/simon

Feature/simon
Tweaks