refactored slightly
Merge branch 'master' of github.com:meetings/gearsloth