Improve install - fix #352 and help for #353