Snapshot 03.07.2014 #2

Everything works again. Clean up code, write the documentation and then
pull to master...