Issue35

closes #35