Merge pull request #1 from prod-dev/master

Pull latest code from prod-dev:master.