Added docs
Merged akaptur changes