[ADD/FIX] Commiting all recent changes.
Merge branch 'master' of github.com:JohannesLichtenberger/sirix