Fixed routing issues
Merge pull request #1 from ryanthames/fix-routing-issues

Fixed routing issues