Tidied up commented out code, fixed missed namespace change. Updated readme.