Modify installation procedure
Data Dir created on boot
Merge remote-tracking branch 'origin/master'