Fixed the null pointer bug.
Merge branch 'master' of github.com:DimitarUzunov/relaxis