Merge pull request #39 from Cook1fan/master

Steven
2014-03-27
Merge pull request #49 from 394802198/master

Steven