Merging branches

Signed-off-by: Steven Sheeley <steven.sheeley@gmail.com>