Merge pull request #126 from Cook1fan/master

Merge pull request #129 from 394802198/master
2014-06-09
Merge pull request #130 from 394802198/master

Steven