Major Bug Fixes

Preparing for the next big version!