Fixes #202 and also adds package tags to another issue because I'm a dum dum
Pull-Request has been merged by pbokoc
Fixes #202 and also adds package tags to another issue because I'm a dum dum