Addressed issue #32 from the issue tracker.