Bug fixing 2 issues

This commit fixes issue #2 and issue #3
Merge pull request #4 from svanharmelen/dev

Bug fixing 2 issues and regenerated the existing packages