Merge branch 'release-0.3'
Nicer README + added flattr link.
Minor reorganization of tests
Minor reorganization of tests
Bumped version to 0.4
Merge branch 'master' into release-0.4
Merge branch 'release-0.4' into develop