Implementing #750. Added necessary changes to job class and wrapperjob so the... Closes #750 See merge request !285