Merge pull request #2 from stefanpenner/updates

Updates
add regenerator (only for tests)