More stuff
Merge branch 'master' of https://github.com/stfkbf/PackageBuilder.git