user my signals
Merge pull request #33 from vns/dev

Dev
Fix: Re-enable clustering. Refactor: More compact code