Issue 255

closes #255