Bug fix: typo in var names. All packaging targets now working. related to #3
Merged dev changes for going into gamma version.