Merge pull request #86 from Cook1fan/master

Steven
Merge pull request #87 from Cook1fan/master

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

Steven