Squashed last 2 commits
Merge branch 'master' of https://github.com/deszip/alcatraz-packages