Merge pull request #38 from realraum/gpg/nicoo