Lucy commit
Merge pull request #61 from lucybot/master

Lucy pull request