New submodules and functionality
New minor version
Merge with upstream