Final Version Commit

Last changes (according to prof. mayrhofers questions) committed