Merge pull request #49 from mancdaz/grizzly

Merged automatically by jenkins after successful build test