Resolved merge conflicts
Check for the envelopes being null
Merge remote-tracking branch 'noctella/master'
Fixed some path issues. diff --bounds works for me now
One final merge with noctella/master
Adding copyright header to BoundsDiffPrinter.java