More or less closes #34