version 26-06-2014
env leaks corrected
merge aymeric