Ash/13w41 fixes

HI Vivek ,

This branch contains latest source code , please accept this pull request on your master branch . and update your code