Merge pull request #67 from Cook1fan/master

Steven
2014-04-17
Merge pull request #73 from 394802198/master

Steven