Gh39 update to self

#39 
I made diff from Eclipse, because the branch has 2 merge bases => a) I needed to merge from command line and b) this github diff shows more than the actual modifications