Closes #17

:+1+: