Merge commit 'f573b25184551b41e153bb153a7cad50b76600c8'
from ctrueden/ASA This finalizes PR #7