WoLF completed. Some small other fixes added.
WoLF completed. Some small other fixes added.
Merge remote-tracking branch 'origin/master'