Merge pull request #60 from Cook1fan/master

Steven
2014-04-08
Merge pull request #67 from 394802198/master

Steven