Merge pull request #10 from Wundero/master

Random little fixes

No changes lel