Added additional error handler
Changing echo to main thread
Merge pull request #46 from jsztompka/integration

Echo moved to a single thread