updating with 1.1.1 changes

@rantler forgot this in the last pull request...