closes #24 en closes #2