added gripe fixes #4