merge tags branch
synchronize with master
synchronize with master
encrypt refactor
encrypt refactor
merge branch with encrypt refactor