merge from v1.0

Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>