Merge pull request #94 from Cook1fan/master

Steven
2014-05-11
Merge pull request #96 from 394802198/master

Steven