Issue #75 Finished

Issue #75 Finished