0-arg dir now works
merge, 0-arg dir now supported
makefile dirty hack