minor
Final fixes
Merge pull request #174 from mhkabir/master

Simplify sync with normal weighted averaging