Added $HOME support
Added $HOME support