fixed #12
update api
Merge branch '1.1-stable'