Tweak
Merge pull request #16 from cts12/feature/simon

Tweak