Declare $s to prevent php warning.
Merge pull request #1 from acjacobson/master

Merge in some noob work :)