closes #187, closes #190