linux changes
Merge branch 'master' of https://github.com/morrisgit/Dairy

Merge linux and windows
credits where due