Merge pull request #607 from Kinematics/4.1-dev

4.1 dev