Added settings for conditional display - issue #95