Merge from master

Signed-off-by: xautlx <xautlx@hotmail.com>