major refactoring, +@Processor
updated tests, minor fixes
Merge remote-tracking branch 'origin/master'