first changes to sinertaler
merge