more and more hacks
Merge branch 'master' of github.com:lucamaraschi/ams-hackathon