Cleaned up branch and prepared for merge