merge gidaio's stuff

I added a package! w00tw00t!