Pull Request for Issue #79

Code corresponding with issue, simple bugfix