new_os #7

Open
mh wants to merge 5 commits from new_os into master

5 Commits