closes #55 en closes #58