Closes #57.
Closes #54.
Merge branch 'master' into stream-refactor