Merge pull request #12 from ablesky/master

dev sync with master
Merge pull request #13 from ablesky/dev

Merge pull request #12 from ablesky/master