changes from  sandeepmistry:master