Closes #84. Also integrates filter stream for correct output.