Fixed the unserialisation of the generator for the general generator (Part of #75)
Merge from PHP integration branch
Add UML class diagram for input file parsing