Addressed issue #33 from issue tracker.