closes #156