Merge: Resolved Conflicts

Merged more changes from Mad's master.