Merge pull request #12 from ablesky/master

dev sync with master