Merge branch 'gh-pages'
better uniform spawning
add pic

for the github
Merge branch 'master' into gh-pages