minor updates
Merge branch 'dev' of github.com:afmpcuser/os