Code refactoring and improvements
Code cleanup
Preparing 2nd release
Added support for the @And annotation