merge commit
fix merge commit
improved multipoles for charge parameters
Merge remote-tracking branch 'origin/master'