FIX: is_master? has been renamed to master?

This seems a merge issue. All tests are passing locally.

Preparing for merging #341