In process of removing dependencey on Armadillo. Bug fixing incomplete.