Merge pull request #246 from davidmsibley/master