Fixed a not correct merge.
Merge branch 'master' of github.com:DimitarUzunov/relaxis