Taking over issue #26 which will close off issue #24.