Merge pull request #15 from chhsiao1981/master

add data/extra related.