Refactored crossPoint and rg into one val
Merge branch 'master' of https://github.com/vegapunk/scala_gaf.git