re added by lb
re modified by vadim
cafe
Merge branch 'lehabik' into go
Merge branch 'go'