Updates for TS 0.9.5 and adds navigator object in a cleaner way. Refs #122