Closes #22?