Fixing prototyping
Adjusting handling of callback methods
0.1.1