Merge pull request #106 from Cook1fan/master

Steven
2014-05-16
Merge pull request #109 from 394802198/master

Steven