Closes #6

#6