Support negative numbers (whoops!)
Merge branch 'gh-pages-highlight-custom' into gh-pages