Updated for the underlying multiple version support.
Merge branch 'multiple-versions' into develop

Fixes #338.