Remove dependancies
Bugfixing and testing
Merge branch 'generator'