Merge pull request #98 from Cook1fan/master

Steven
Merge pull request #99 from Cook1fan/master

re
2014-05-13
Merge pull request #101 from 394802198/master

Steven