Merge pull request #216 from jsorg71/master