Merge pull request #23 from Cook1fan/master

Merge pull request #36 from 394802198/master
2014-03-14
Merge remote-tracking branch 'origin/master'
Merge pull request #37 from 394802198/master

Steven