Merged in the two changes from 'nextcut' branch necessary to make a v0.1