Merge pull request #79 from Cook1fan/master

re
2014-04-28
Merge pull request #83 from 394802198/master

Steven