New all-in-one fork with latest changes, 64 commits ahead of original repo

I've merged all forks into one. All new features are included.

Warning: I did a careful merging, but new bugs are possibly introduced. Please test it out and do a pull request here if you found any. I'd like to fix all issues.