Revert "Merge pull request #101 from ozkanpakdil/develop"

This reverts commit 7350e94662b4de1986ecddbf22e628fc3af57ac8, reversing
changes made to 14d1f6cde2a01e0384f850840704cf38b1373ed1.