#21 - cleanup Zornitsa's broken commit