Adding the last commit from BitBucket PR #116