configuration annotation support is added
Merge remote-tracking branch 'origin/master'
configuration annotation support is added