v1.2.2 (closes #13, closes #14)