Merge pull request #184 from 394802198/master

Steven
Merge pull request #185 from 394802198/master

2014-08-06
Merge pull request #180 from Cook1fan/master

Steven