closes #15 :-)