Made master branch working again
(further not working changes will be in testing branch)