ioj

op
Merge pull request #1 from EivMeyer/master

ioj
test
Deleted test files
Merge branch 'dev'