Merge pull request #169 from Cook1fan/master

Merge pull request #173 from 394802198/master
2014-07-23
Merge pull request #174 from 394802198/master

Steven