Merging manually 2 commits (#387 and #394)