reverted armadillo changes because of windows linker errors and pushed this into new branch "Armadillo"