Merge pull request #88 from Cook1fan/master

Steven
Merge pull request #89 from Cook1fan/master

re
2014-05-07
Merge pull request #91 from 394802198/master

Steven