Merge remote-tracking branch 'origin/develop' into feature/ssh-adaptor-3
added exceptions
Merge pull request #26 from NLeSC/feature/ssh-adaptor-3

Feature/ssh adaptor 3