some correction on the last edit and introduced new template from TU Wien