Merge pull request #307 from absmall/master