merge
Merge branch 'master' of https://github.com/kiriaze/simple-cpt-plugin