Proposed solution for Issue #41

Changes current per #41 and closes #41.
Remove duplicate set
Merge pull request #44 from SignalK/issue41

Reorganize current group