Merge pull request #10 from micky2be/master

Error handling and Class removal
* Calling onfinish in all cases