Some fixes
Merge pull request #14 from yoksel/master

Synchronize