Formatted readme.
Improving error-handling.

It kind of sucks right now.
Merge branch 'master' into devel
Fixed a lot of error handling crap.

And updated tests.