Merge pull request #106 from lairdm/master