Commit@Nikhil@27nov2014Evening

Bug fixes