Merge branch 'dev'
TODO
Merge pull request #1 from guneysus/master

Master