Merge pull request #42 from davigotxi/master

Fix handling of data_dir, etc_dir and log_dir