Closes #24

#24