Merge pull request #19 from apmon/jsroute2