working

Greneral update to master branch