Introduction improvements - fixes 436

Fixes #436.