Few fixes
Merge pull request #1 from hilmekrhu/patch-1

Few fixes