moved todo
Merge remote-tracking branch 'upstream/master'
fixed minor bug on route
Merge pull request #26 from cd34/master

a few fixups