Stefan Schukat - 2013-05-14

Patch with possible bugfix