Closes #213.
Closes #211.
Resolving conflict.