pushing changes
Merge pull request #25 from thewillhuang/simon2

pushing changes