Resolves issue #126
Merge pull request #127 from kris-sigur/Issue-126

Resolves issue #126