Stable/grizzly

This patch fixes issue #96. I have included @rbramley changes as well.