Re-mostly resolves issue #22.

Refer to Mostly resolves issue #22 for more info.