Closes #11

#11