removed .nio imports
Merge branch 'alex' into develop