Merge pull request #36 from qubell/develop

Master is 1.26.26.0