Merge pull request #1 from worklist/master

Pulling in changes