Fix scandir method, create simple runner for testing
Merge remote-tracking branch 'origin/master'