Updated TODO, Switch statements are good.
Merge branch 'master' of https://github.com/EdwardLiang/Dream.git