Latest changes

Contains an updated README and a tiny bugfix.

Just to avoid conflicts before you start ;)