Fixing merge (see #38)