Merge pull request #1 from 0lvin/master

cp3dcg + cp3dug support.
Merge remote-tracking branch 'upstream/master'