Develop

Merged with newer master changes and added string matrix input to distMatProcessor