closes #133