Merge pull request #24 from mancdaz/grizzly

Merged automatically by jenkins after successful build test
Merge pull request #25 from mancdaz/grizzly

Merged automatically by jenkins after successful build test