Updated OLMAR (bug-fix and major refactoring. Added OLMAR universe implementation.