Issue #46 complete.

Issue #46 complete. Branch complete.