Closes #15

#15