Version 1.3.1 : Multitude of changes