Squashed multiple commits

See Bitbucket account for more info

Signed-off-by: dragon <dragon7780@hotmail.nl>