Integrated changes with latest boilerplate

Signed-off-by: Alan Brown <alanb@weared8.com>