Closes #14