Merge pull request #80 from luwei0917/master

5:03PM 4/15/2014
5:04PM 4/15/2014
Merge pull request #81 from luwei0917/andy

Andy