Closes #8

#8