Merge pull request #76 from luwei0917/andy

Andy
jjj
jjj
Merge pull request #80 from luwei0917/master

5:03PM 4/15/2014