Addressed issue #44 from the issue tracker.
Addressed issue #47 from the issue tracker