added stuff from 'dev' and 'doc'