Plese merge Notify branch

That would close issue #39