port
Merge branch 'master' of https://github.com/francescozaia/mf-hackday
bugfixing, styling