Tested version

Its meant to be used as a standalone library