closes #49
merging