Merge pull request #19 from belindahare/master

routing errors fixed