Changed some settings
Removed some shit
Changed link
Merge branch 'kmom05'