Merge pull request #41 from willkelly/grizzly

Merged automatically by jenkins after successful build test