Merge pull request #76 from mikey179/master

stuff for 3.3.1
initial work for #77