Clarify merging

This closes #163 where i complain about the order of the merging.
Merge pull request #164 from Benjaminsson/patch-1

Clarify merging