merge 56249953 from develop (closes #205)