Bug Fix
Merge branch '1.0.4.1' of https://github.com/calois/ACAE.git into 1.0.4.1