Updated API to return dicts, trying to figure out this whole docs thingy
Merge remote-tracking branch 'origin/master'