Resolve #525
Merge pull request #526 from jherdman/resolve-525

Resolve #525