updated changes
mergeMerge branch 'develop' of https://github.com/agile-geoscience/modelr into develop