#34 reverted, development goes into branch