merging henry's code
Merge branch 'master' of https://github.com/timsoulm/gRouter