Snicolas/issue 215

Should be merged ASAP