adds fixes
Merge pull request #3 from ktaras/dev

adds fixes