initial
Merge https://github.com/cputinar/Hackathon