Small changes
Merge pull request #42 from yoksel/master

Small changes