merging hackathon to master