Dev

Updated by Xin Peng Zhang 11/3/2014