Added non linear elements to setvalue and getvalue
merging