Merge pull request #101 from Cook1fan/master

Merge pull request #102 from 394802198/master
2014-05-14
Merge pull request #103 from 394802198/master

Steven