Merge pull request #16 from bobby-brennan/lucybot

A pull request from Lucy
Lucy commit