Submodule updates and code cleanup.
Merge pull request #25 from commi235/develop

Submodule updates and code cleanup.