Fix #307 - Added notification