Fix bugs
Merge pull request #3 from yoksel/master

Fix bugs