Addressed issue #35 from the issue tracker.
Addressed issue #37 from the issue tracker.