Merge pull request #37 from Cook1fan/master

Steven
2014-03-26
Merge pull request #47 from 394802198/master

Steven