Merge pull request #24 from Cook1fan/master

Steven
Merge pull request #25 from Cook1fan/master

re
Merge pull request #26 from Cook1fan/master

Steven
2014-03-17
merge