Added change proposed in issue #1 @dblock