Base URL shortening
Merge branch 'master' of https://github.com/strattonw/pnt2