merge #44 closes #43