2.2.1 update, closes #134