Merging latest changes - reformatted/optimized code - renamed group id #33

Closed jschneider closed 10 years ago