Addresses issues 612 and 613

The changes in this branch address Nose bugs 612 and 613.