Sorry, previous commit wasn't finished (Closes #19)