Added Hangtao's package from Summer Project 2012