commit by Gitpost
Merge https://github.com/smallyard/Gitpost