Merge pull request #60 from luwei0917/andy

Andy
Merge pull request #61 from luwei0917/andy

9:09PM 4/14/2014
Merge pull request #63 from luwei0917/master

9:50PM 4/14/2014