Restored default of 3 rounds
Resolving merge conflicts
Whatever, take them both, I don't care anymore
There, does this make you happy?
Merge remote-tracking branch 'upstream/master' into 1183_default_rounds
Removing spaces someone else left in

And which caused me a massive merge headache.
Added "assert" to test
Merge pull request #1188 from AdmiralJota/1183_default_rounds

Restored default of 3 rounds