Merge pull request #185 from davidmsibley/master