Addresses some of issue #87