Merge pull request #147 from Ferada/defpackage