Dev

@pitgrap What do you think? Some new options - see README