Merge pull request #153 from joeyh/master