Merge pull request #192 from lairdm/master