Simplifications (no longer compiles, just wait!)
Merge pull request #42 from Winston-Chan/nathan

Simplifications (no longer compiles, just wait!)