Merge pull request #128 from Cook1fan/master

Merge pull request #131 from 394802198/master
2014-06-11
Merge pull request #132 from 394802198/master

Steven