Dirty capabilities decoupling
Merge pull request #14 from goncalvesjoao/master

Dirty capabilities decoupling