Merge branch 'issue105' into 'master'

Fix #105 - Unify expand and expand_add

Closes #105

See merge request simgrid/simgrid!92

diff --cc ChangeLog
Simple merge

diff --cc MANIFEST.in
Simple merge