Final version
Merge https://github.com/wabmca/Petstore