Exit if cycle and do not fail if new package.
Replace internal variable name.
Merge pull request #13 from aplanas/master

Small issues fixes.