Reverted to master, accedentely included commits not wanted. Second try