work on patch
Merge branch 'master' of https://github.com/thruthesky/x