merged rounds 4 and 5
Merge branch 'master' into ag_rounds_4_and_5
Merge pull request #34 from wasade/ag_rounds_4_and_5

Ag rounds 4 and 5