Started working on graphs and settings
Merge remote-tracking branch 'github/master'