Issue #24 part 2: follower merging fully implemented

What we need now is more Javadocs and unit tests.