Merge pull request #2 from sall/master

Pull to get up to date