Merge pull request #125 from Cook1fan/master

Merge pull request #128 from 394802198/master
2014-06-07
Merge pull request #129 from 394802198/master

Steven