#104 clean up reset behavior
#78 added concepts for @Default, @New and @Any qualifiers
Merge remote-tracking branch 'origin/master'