Merge pull request #1 from guneysus/master

Master
Merge pull request #2 from guneysus/dev

Merge pull request #1 from guneysus/master