Manually merged pull request #14 using git cherry-pick