Some fixes
Merge pull request #6 from yoksel/master

Some fixes