Merge pull request #80 from Cook1fan/master

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