Slight modifications
The last commit before porting to gobject introspection
After porting to GObject introspection