Latest commit cd4c10f Jan 12, 2014 csoler code cleaning