added process exit to avoid hanging processes
Merge remote-tracking branch 'origin/master'