Merge pull request #6 from koma75/develop

Error handling implemented