Fixes #300
Merge branch 'fix300' of https://github.com/ucb-bar/chisel into filename_fix