Merge pull request #41 from mikey179/master

stuff for 2.6.x
upgrade