Updates

RC1-1
Signed-off-by: ahrasis ahrasis@gmail.com