Merge pull request #111 from Cook1fan/master

Steven
re
Merge remote-tracking branch 'origin/master'
2014-05-21
re