Initial commit
Improved code base; added annotation-aware class; some refactorings
Merge remote-tracking branch 'origin/master'