minor
minor rename
Merging features/weighted into master.