beeyev Merge pull request #29 from beeyev/7.7