Integ + wei (lol)
Merge pull request #329 from VincentCharpentier/Vincent

Integ + wei (lol)