spidermonkey work
Merge branch 'sm'