Merge jksketch changes

wondrous @jhkeilson changes