fixes #27
Merge branch 'master' of github.com:okadri/dss-messenger