gfgf
new version

fixes, new features, refactorings