closes #21

:+1+