Addressed issue #36 from the issue tracker.