Updates for service changes and some bug fixes
Merge pull request #2 from memnuniyetsizim/master

Updates for service changes and some bug fixes