quick and dirty update for 3.6.6
Merge pull request #19 from xulture/master

quick and dirty update for 3.6.6