removed parameterize submodule; located in separate branch for now
Merge branch 'master' into develop