rebase of Pull #49 from DavidWittman

Closes Pull #49 This rebases his commit against grizzly