Merge pull request #3 from Roll20/master

Pull from origin