closes #109, closes #110