Merge pull request #536 from zhekov/spawn