Merge pull request #20 from Cook1fan/master

Steven
Merge pull request #21 from Cook1fan/master

re
2014-03-14
2014-03-14
Merge pull request #22 from Cook1fan/master

re
Merge pull request #36 from 394802198/master

Steven