added info possibility. CURRENTLY BROKEN
Merge remote-tracking branch 'origin/master'