Change logic slightly
Merge branch 'master' of github.com:ConversationDevelopers/conversation