Merge pull request #17 from bobby-brennan/lucybot

A pull request from Lucy
Lucy commit