Merging some changes from ulusoy branch
Merged branches after a long time