Alerts added -- fixes issue #38