slight changes to variables
Merge branch 'master' of https://github.com/architarious/cpass-toolkit