Feature/docs api rebased

This rebases your branch off of master, @ralphschindler