merging

Signed-off-by: Steve Dekorte <steve@dekorte.com>