Merge pull request #1 from thagenbeek/release

reset of data, and error handling
Merge pull request #2 from thagenbeek/master

Merge pull request #1 from thagenbeek/release