add personal customizations
merged with master
merged with master
resolved more merge conflicts