v1.3.1 (closes #14, closes #15, closes #20)