Add token locations
Fix for unhandeled exception
Merge branch 'master' of github.com:JarvusInnovations/SeptaMobi