Merge pull request #32 from jnugent/master

*8823* submodule changes track ##jnugent/master##