Changed the library to be a Constructor, fixes #2