Merge pull request #51 from NickLarsen/master

1.1.0 through 15:00
1.1.0 through 26:00