Merge pull request #1 from brkakkaya/dev

Dev
made some fixes