weekend shit
Merge pull request #1 from joertler/weekend-updates

weekend shit