added wrapper methods, fixed circular reference toString issue, added
tests