Merge pull request #161 from Cook1fan/master

Merge pull request #166 from 394802198/master
Merge pull request #162 from Cook1fan/master

Steven
2014-07-15
Merge pull request #167 from 394802198/master

Steven