Merged UnzippingDecider to master
Fixed checkstyle error
Fixed merge conflict