Added Armadillo to the rest of the code.

Signed-off-by: OPSand <o.p.sand@live.com>