Merge pull request #188 from nhr/master

Behavior bug fixes