Merge pull request #68 from richard-willowit/version70

Pull in of renatonlima (Akretion) changes.