version 2

At this point, this doesn't change the code, don't worry if you don't want to :D I'll be fine with your decision.

As for the merge, I'll do it as soon as your saying that everything is fine.