* Error handling and Class removal
Merge pull request #10 from micky2be/master

Error handling and Class removal