First version of bugfix for #473.

Waww, that was more work than I thought. :D
While coding this I came unfortunately over a couple of other bugs. We need really a some more closer look over the source code and need to make through some test-cases. We should not press out new Alpha versions until that.

TODO

- [ ] Remove debug stuff
- [ ] Write documentation
- [ ] Write full list of bug fixes