Took care of issue #81