Fixed required os issue.
Merge branch 'development'