Merging patch by psockali@gmail.com, to include 'obser'