pushing CG changes
Merge pull request #6 from drossellat/master

pushing CG changes