merged build 499

Signed-off-by: zvvn <wooki.za@live.com>