Merge pull request #28 from pysailor/master

More dexterity-related fixes