merge test
Merge pull request #9 from lazy-night/dev/api

merge test