changed somethings
Necessary due to out of date pull
Merge branch 'master' of github.com:aaltsys/doc-develop
New changes