Merge pull request #122 from sheaff/master