Merge pull request #2 from afdata/hotfix-1-quotation-marks

[#1] seperate the value forwarderopts and extend the classes in