closes #151