Recover commit 6a639fe49803a78f514d1001d2ff1c3069cb3ce9
Merge pull request #537 from normanjaeckel/Recover_Commit

Recover commit 6a639fe49803a78f514d1001d2ff1c3069cb3ce9