fixes
merge
docs module separeted