Merge pull request #52 from NickLarsen/master

1.1.0 through 26:00
1.1.0 through 37:00