Merge pull request #71 from luwei0917/master

10:43PM 4/14/2014
Merge pull request #75 from luwei0917/master

11:45PM 4/14/2014
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/andy'
11:48PM 4/14/2014
Merge pull request #76 from luwei0917/andy

Andy