Feature/merge dev and docs