closes #150