Issue 19

closes #19 and closes #43