working on some addit stuff
hotfixing adresses
cont. working on feature
Merge branch 'iss53'