Merge pull request #5 from mlhim/master

Update to master
Merge pull request #6 from mlhim/xml2ccd

Merge pull request #5 from mlhim/master