* Fix #311: "Can't seem to open a shell"
* Minor refactoring for os_detection
Merge branch 'hotfix/shell311'