Error correction for packaging
Some improvements.
Merging from gdecapoa-master