observer is not null
Merge remote-tracking branch 'origin/master'
corrected wrong javadocs