master closes #165