Added errors
Merge branch 'master' of github.com:fengsp/pencil
Fixed routing