Resolve #19 - Observer