Small Changes To Prepare Pull #589 For Merge
Merge pull request #2 from harding/final-changes

Small Changes To Prepare Pull #589 For Merge