Not handling return valur of the client
Change element name of mq-state
Merge branch 'develop'