Critical fixes
Merge pull request #4 from DWorkS/dev

Critical fixes