Merge pull request #188 from Cook1fan/master

2014-06-27