Merge pull request #3 from jwhonce/wip/refactor

WIP geard packaging