V.2.0

added stuff from 'master' file
V 2.0