Closes #23