documentation + mini refact
Merge branch 'doc' into dev