Tweaks
Conflict resolution
Misc Bits
Merge pull request #15 from cts12/feature/simon

Feature/simon