small fixes
Merge branch 'master' into frontend-os
Merge pull request #8 from jpk1215/frontend-os

Frontend os