Find the bug.
Merge branch 'highlight' of github.com:GorillaApp/gorilla into highlight