Merge branch 'dev' of https://github.com/loqui/im into dev