Pull to fix issue #2086

I already left a pull request before, but now via the official github method :)

This pull request includes the processed suggestions of csware and linquize.