Experimented on new features. Best yet.
Merge remote-tracking branch 'origin/master'