made some fixes
Merge pull request #2 from brkakkaya/dev

made some fixes