Fix a typo

closes #467
Update Submodules
merge upstream