Merge with adx-1.2.4

plus some comments