Merge documented code into master