Fix for issue #677
Fix for issue #677
Addressing comments for merge
Addressing last comments for merge
Fixing typo
Merge pull request #683 from antgonza/fix_issue_#677

Fix issue #677