Merge pull request #22 from realraum/gnocci/setup