Added some doc strings
Added test results again
Merge remote-tracking branch 'origin'