Motive1.7+

Same PR as #6 just to a different branch.