Merge pull request #1 from benkeen/master

Update for 3.06
Merge pull request #2 from benkeen/master

Update for 3.07
Merge pull request #3 from benkeen/master

Update project from fork
Merge pull request #184 from twindual/master

Sync generate data