Merge pull request #193 from Cook1fan/master

2014-09-01