Changes for issues #46 and #49.