Puggle Solution
Merge branch 'puggle-team'