committing changes from Conrad's first beta for Armadillo 3.930