Some refactoring
Merge pull request #1 from cagataycouk/master

Initial contribution