Closes #111. Closes #112.