Pullrequest01

Try to merge updates from AMOSE gitlab.