Integration Request 1

We rebased our commit history and added the fixes you requested.