Previous commit fixes Github issue #131
Packaging