Merge pull request #2 from jleen-sfdc/master

Some stuff