Version and header update
Merge pull request #9 from allenxwang/master

version and header update