Merge pull request #58 from Cook1fan/master

Merge pull request #63 from 394802198/master
2014-04-04
Merge pull request #64 from 394802198/master

Steven