Remove some ugly parts of the code
Small refactoring
Rename matchers (to 'All' and 'Any')
(WIP) add access modifiers
Fixed code for Beta4
Some stylistic changes
Fix TODO's