Issue26

closes #26