before presentation
v 0.0008
Merge branch 'hackathon'