Lucy commit
Merge pull request #58 from lucybot/master

Lucy pull request