Tested and working see issue #204 (closed) for details.
This will create a new commit in order to revert the existing changes.
