integrate OlegHahm@1d6aab8, fix description
review WIP