Some fixes
Merge pull request #8 from yoksel/master

Some fixes