Making changes.
Bug fix for error found in review.
Merge pull request #1 from dkolb/dev

Accepting merge.