Final commit

Not tested library