Pull Request for Issue620

Took care of both of those.