closes #132. Closes #131