20140505 last updates

merge last updates from aashish24