Closes #14

#14