Update from the weekend!
Finishing for tonight :(
Merge pull request #1 from werer9/linux

Linux