Issue30

closes #30