Manually merged pull. Closes #26