removed class attributes
added multiga
faster test
pre-merge
Merge branch 'multiga'