add andrew vaziri's suggested fixes
Merge branch 'master' of github.com:pkarasev3/nlmagick