This is the source code of my attempt to merge GT3b1 and 1.0.1 sources.

EDIT: Updated source to include fix for q 0

For further information, please refer to this thread