This PR is now obsolete. Changes in it are incorporated in #391
Pull-Request has been closed by japokorn