Merge pull request #29 from Cook1fan/master

Merge pull request #40 from 394802198/master
2014-03-20
Merge pull request #41 from 394802198/master

Steven