closes #6
Merge remote-tracking branch 'origin/gsaa-style' into gsaa-style