Merge it!

Changes from private fork