Solves some of bug report for Jan.30/2014
Bug fixes for Jan.30/2014, Part 2
Merge files