Merge pull request #59 from luwei0917/master

8:51PM
8:53PM 4/14/2014
Merge remote-tracking branch 'remotes/origin/andy'
8:53PM 4/14/2014
Merge pull request #60 from luwei0917/andy

Andy