Some changes
Merge pull request #12 from yoksel/master

Some changes