modified #msg
Merge branch 'develop' of github.com:ivezuki/hackathon into develop