Merge pull request #98 from rackerjoe/grizzly

Merged automatically by jenkins after successful build test