Updates from sg-kit core
Merge pull request #1 from sjsandy/develop

Updates from sg-kit core