Develop

New Pull request with tensor indices fixed. It is under test now!