enhance 13 + 14
Merge pull request #22 from smartpad/enhance-13-14

enhance 13 + 14