Minor packaging changes
Fixed GitHub issue #23