Merge pull request #45 from Cook1fan/master

Steven
Merge pull request #46 from Cook1fan/master

re
2014-03-28
Merge pull request #55 from 394802198/master

Steven