Merge pull request #7 from mmmavis/bug-1113826-updated-goal-2.1

Bug 1113826 - add updated goal
Merge pull request #8 from mmmavis/bug-1113826-updated-goal-2.1

styling tweaks
style tweaks