More robust data directory detection
v1.1.1 release