Fix site generation & update spawn usage
Merge pull request #344 from yAngle/master

Fix site generation & update spawn usage