Test files
annotations code generation support added, etc.
Merge remote-tracking branch 'remotes/origin/master'