closes #113 closes #114 - resolved previously