Some important fixes
Some fixes
Merge pull request #10 from VladVin/vlad-new-branch

Bag fixes