some structural changes, added installation
Merge remote-tracking branch 'origin/master'