Merge pull request #168 from Cook1fan/master

Merge pull request #172 from 394802198/master
2014-07-21
Merge pull request #173 from 394802198/master

Steven