added dir list testing and fixed bugs found in testing
Merge branch 'master' into 0.0.x-dev