Massive update to the lib
Updated readme