Latest commits should only fix issue #34 - remove side commits