bugfix
Merge branch 'master' of https://github.com/gem-sw/GEMCode
Merge branch 'master' of https://github.com/gem-sw/GEMCode
General OR/AND functions
commenting functions
Merge pull request #81 from dildick/master

Bugfix + commenting functions