Bugs fixed from older version and some new functionalities (see changelog)