Bug Fix. Added spawn options.
Merge branch 'master' into wt