Changed set to map. Fixes #49
Refactored Feature. Fixes #41 and #42
Added missing test