This Waiter destruction in waitFor is still problematic
Merge branch '0.5.0' of github.com:hers-belgrade/hersdata into 0.5.0