#555

Request to merge #555 into the master branch.
I just did this.