fix issues
Merge pull request #154 from Verkalets/fix_bug

fix issues