Closes #5

Now against branch Hackathon .