added group method
better commenting
merged master into group