Added docs, see #103
Merge remote-tracking branch 'origin/master'