Merging current population branch

This way future modules can be developed from a standardized baseline.