rebase of Pull #49 from DavidWittman

Closes Pull #49
This rebases his commit against grizzly
Merge pull request #56 from rackerjoe/PR49

Merged automatically by jenkins after successful build test