Made package properly installable as both a library and a script