Buffer was overflowing, switched to spawn for more stability
Merge remote-tracking branch 'origin/master'