Merge pull request #49 from Cook1fan/master

Steven
Merge pull request #50 from Cook1fan/master

re
2014-04-2
Merge pull request #58 from 394802198/master

Steven