Merge pull request #1 from burnbright/master

from burnbright master to my master
Merge branch 'ss3'
Merge pull request #3 from wildflower/master

ss3 to master