Bug fixes
Merge pull request #1 from VersoCore/dev

Bug fixes