first commit
Merge branch 'master' of https://github.com/matorres/cetc_3dm
second commit