Respecting commandline configurations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/undecided/DirectoryListerTest.java
Respecting commandline configurations