release candidate
Merge pull request #1 from milror00/1.0.26

release candidate
Merge pull request #2 from milror00/1.0.22

jnkjjkjk