Merge pull request #151 from kenbell/master