final commit
Merge pull request #1 from mrdanding/master

merge request from xia @version 1