Merge pull request #16 from aelaa/production

Info in commits
async messages fixed