Closes #19