Merge pull request #163 from Cook1fan/master

Steven
2014-07-15
Merge remote-tracking branch 'origin/master'
Merge pull request #168 from 394802198/master

Steven