Some implementation
Merge branch 'master' of https://github.com/JBCity/jbcity