Issue 274

closes #274